Merge from emacs-24; up to r111345
authorGlenn Morris <rgm@gnu.org>
Fri, 26 Apr 2013 07:34:54 +0000 (00:34 -0700)
committerGlenn Morris <rgm@gnu.org>
Fri, 26 Apr 2013 07:34:54 +0000 (00:34 -0700)
commit2fa03e305abe824b490768581e0320ce10793912
treee385edc7f1ead284dc7eef6aadc14a9860151dc3
parent7d62cbf61666c2b61efd60fcf26b557171cef7e5
parent8995a216de39c618c8f4a10b4b58140d8f9a6dfe
Merge from emacs-24; up to r111345
lisp/ChangeLog
lisp/subr.el